more structural edits