some changes

Change-Id: I62174551c5ca3ffbe273c77d531c9296b8b2458b