Changed parameters to work with extraction from cross section, in general working quite well