Total code rework