some modification

Change-Id: Ic75c9415c3818bdea65f6cdee024344d8bb90e54
just another commit

Change-Id: Idb3ace6fa2f0bc7e7141556ca7460327ec86ffcf