Updated calculator
Updated calculator