Shift towards matching MCPatcher CTM implementation - higher function