Added combat system