Update commit from Casey's comments