some changes

Change-Id: I09277c11699b8074cc2c92378e2df606bcef652d