some changes

Change-Id: I829523f4be8381575b279687db55b30b5cb36a0b