Preliminary solution to issue #3
Continuing issue #3