Switched sciency things back on when testing
Merged master