Reworked a lot.