a few changes from cm