Working on mpc issues
Removed line from merge