changes to reflect comments from https://rbcommons.com/s/twitter/r/637/