Updated for HW4-Part2