changes due to review feedback