Update for @claywilkinson's comments