New impl

Change-Id: I694aa2185f1353f5dabe66c2cf7e4a4488985eac