updates according to review feedback