Move to use new gmpc function