some work on #846