exercise 1.5,1.6 corrected