More merge conflicts
I turned it off at startup so that the constant visuals on the stage would not slow down the system.