Update on Battle.java