edited exercise 2.1