More work on #33