code updates

Change-Id: Ica493691ddce7f158c85b24f98e422cf73ec0e12