Still some small changes
Fixed a mergeco conflict and added my own tweaks
This is the correct version