Updated for HW4-part1