Still trying to fix, cgmcandrews