Control reworking