update following feedback