Updated per @sgrif's comments