Added turn switching