some rationalization of the calculation + a benchmark file