Revert "Revert "Revert "Revert "Fixed Noisemaker""""

This reverts commit c6c8927084345823a0b7db2dda64d730b56f7172.
Finally Fixed Noisemaker Properly