Added more to combat system