Maybe also re-evaluate the timers in other gamemodes, you wouldnt want your gungame streak to reset mid-game or perhaps make the default time in training infinite, and so on.