Improve noise stuff