Switching now takes into account all Pokemon