Updating with HW4, part1.0