Rework of functional units