Updated to latest CM version