some changes

Change-Id: I6da27c58b2b564cbc5ec848f82019146a978ac7c