New noise code WIP