merge with CM - WIP