Updated CombatControl