tried to fix battles... still broken