More work on switcher.