Adding Sam's changes from 2/22