more work on conversion

Change-Id: I32bfac0d7bf8350b13fee7444cd6816777692efc