Reworked a lot