changes to support mcm