Upgraded for GMP @6.0.0_1