(1st) final commit for HW3