updated cm and cmp
Update formatting