Finishing the second part of exercise 1.7