Fixing up HW3/HW4 results