Updated calculator work