trying some new changes to make it easier to merge remote upstream