Fixing a bug and cutting down the noise