re-roll with fixes for comments in #26