Reworked my model with a better tool and as such could produce a better model. Hopefully it is better this time