some work on issue #8