proposed changes by @jeffmo are now in