updating PR per @JustinSainton notes