Updated for HW1