Changes to r_cmt