Edits from Sam