incorporate @ahocevar's review