updated to state of exercise 1