update following review feedback