Reworking the outline heavily