resolved exercise 2 requirements