working on issue #7