Some more work on #2.