Added HW 10 stuff