Changes after exercices from chap 06