Reworking everything!