issue #7 rework

Made additional reworks for Issue #7