incorporate review from @ahocevar