Rebased the solution
Meant to do it this way but forgot...