adjusted for new mssm categories