changes to complete issue #35