Edits from our meeting...