Remaining week4 changes.