started working on issue #3