Final editing of exercise 6