refinements based on discussion