Updating mpc stuff to match what I've got