address feedback from @spencerkimball