update following discussion