HW3 - 06&07 - done