Slight update to algo logic -> MUCH better results