Somehow mis-copied the stuff from GDP, this should be better

Here are my actual gdp fixes, got it to work locally.