OZP-16: progress on switcher