Edits as per Conor