revision per @revans2's comments