Allow selection of modalities
Solve merge conflict (damn you dani_lat)