improved 'player switch' mechanics