Last change on battle.java