small steps

Change-Id: Id103118b4fac5d5453f4d1ca16d3ae14140e3917