more progress

Change-Id: Ib6bdfd66902151defac4e2e8c4fc8f3c659044d0