Added mode chooser