updated per @kalabiyau suggestions