Initial reworking.