More work on #10