Sync up with CM