Start of smoothing remaining work

Start of smoothing remaining work