Updated  the combat_controller to be strict.