Niantic, please change the way we swap Pokemon in PVP