Changing over to mcp