more work done to issue #9