Fixed some code to work with Sam's