More work on #23