Well this took a while to finish but good thing I did.
Sharing the old ref as a comparison to show the difference