updating per @srossross' comments