more updates to issue #4
updates resolve issue #4, will open new issue for file size reduction