Update with @scottpurdy's feedback