more work on #12