implement some of sams edits