Some reworking.