Test on real data before merging
added 1 commit
Compare with previous version
Tested and works, merge after school study completes
merged
mentioned in commit 65a69bd3