Chris' revised MCP class