Completed exercises 3.5 1 and 2 again