Added better combat system