updates to battle flow