edits from Robin meeting