update per Josh Berkus comments