Made new battle system work