Working on issue #6