some more work on #8