BattleSwapFix2