fixed Battle, but still need to be made better