Additions added for calculators.