updated with content for HW4.2