Updated the design to fit HW4, Part1