Resolved exercise 1.2