Adjusting for notes from @dougblack