progress

Change-Id: I4ae19f702b3b30b17c1afb0a65a0f4b5ab527480
scratch one bug

Change-Id: If04c2738b959eb06ea5a8abef79e944a259dfdb5