finished first version

Change-Id: I5c33b8b3e8bd162fae2d4e57ad6a75f230115d9a