Moved the grenade change to a more appropriate place