Updated calculator for HW