Rework continued

Change-Id: Id37d56cb2464ffc2ed7bbe51dda40e9259d55224