Got some help from Adam. Not sure if it helped.

Feel free to revert