more work on #92