Seperate modal and bmodal classes