Renamed exercise 6 and 7