removing some cm stuff, adding others