Updated with new battle ui