Improved player game mode change efficiency

Improved player game mode change efficiency