changes based on responses from @swails and @jchodera