Fixing exercise 1 and 2