More merge conflicts. Taking main changes then will integrate mine.
I turned it off at startup so that the constant visuals on the stage would not slow down the system.
