changes made according to review