edits as per meeting with mb