Final fix to noise code