Revised per Dan's comments