BRANCH 4.2-DEV: made it look at a few more columns