some changes

Change-Id: Id3f178e77450c653da055afd5b826d94d8743836