Edits from sam 11/1