code rework 2