Updated calculator