adding changes from review