Rejig optimization