A little work on #1.