done issue #57; work on issue #58