strengthen tree

Change-Id: I20d4334fa35be8bdb6b0fb0d9fd8060340779b96
do some changes

Change-Id: I7d92807474e6410df949103d8f9fcf964185bdce