Last exercise 2 changes