CLF rework