battle still messed up