Add the computation of non-scaled data, note that ELCM does use non-scaled data