Sam's changes