Addresses Sam's comments