Revision based on @jgraham's review 40 minutes ago