workin on issue #2