Replace Combat with CombatSimplified