Reworked commit for Gladiators2