working on issue #3