cm1 more generic + new cm1 class