exercise 1 editing and exercise 2 third attempt