Complete reworking.