To be replaced with new calculator
