Major changes to game entities and logic