More HW4 stuff