done issue #5; work on issue #6