preparation for hide and reversed

Change-Id: If34c8550b3235d7c623d88c919c7bc4fff3ecc5f