ANywys, I did go forth and change it up to hopefully fit more in line