turned off recentDataCalculation. renaming functions