Now pitchers and batters switch correctly