more wip for cmm