some work on issue #3