worked on #127, battles might work correctly