more edits to discuss