some mods

Change-Id: I007a41bc905266f3767da5623eabe355bee68c02