more work on #1