attempted to fix MCP patches, 4 out of 12