fixed issues related to exercise 7