New version with modality selection