Optimizations for Monstro & Watsyn
Fix previous..
Revert partially one of the previous optimizations, was causing some unwanted noisy stuff
Merge pull request #651 from diizy/master

Optimizations for Monstro & Watsyn