Reworked a lot of things again