Added ability to extract total whenever