MotF update for C-SM, closes #281