Issue #7 reworks

Reworks for issue #7