Adding changes from review no. 2