addressing feedback from Dave Jilk