HW30 Part 2 Added