subscription code rework