Rework continued

Change-Id: I04401c78844807751a7dda835c9df8e9aa82bcb0