Reworked a bunch