Added to Sam's change