Added configuration for calculations
Calculations funtional but not yet tested