more work on #158