added switches to captures of unison