work on combat system