refactor MC to MX