re-basing on cm