ok, will merge as is and fix things when/if 145 gets merged