working on issue #31