some work on #1272