some work on #29