continued tweaking the first CM1 template