About revamp

Change-Id: I5d7622170ec2eb904d588e3292fa144275d737a8