Revamp one more time

Change-Id: Ic03f07a20ba0cec108cafee823b87d9ca844f045