address @spencerkimball's feedback