Reworked everything.