being modified for HW4