cleaning up; work added