Added radial dependence to generating function and hopefully streamlined analysis.