Improved handling of noise