Great work! This is a huge improvement! +rep!