Improvements to battle