fixed issues related to exercise 3