latest changes from review