changed key commands to switch