Update to match Justin's comments