working on issue #2