more changes regarding issue #3