some changes

Change-Id: I1dced699cdd904d4490e4eec2af6abb95b3a9398