Upgrade for HW3