implemented changes from review