Merging HW7 changes into main site.