update to r2.2 and use some cm stuffs