More work on #3