all edits before sending to Yannis