merged GameMode1 changes