updated for HW 1