Updating Sam's Changes