Reverted some changes that made the game unstable and slower