Additional work on issue #10