more adds

Change-Id: I89a8787beb9eed2c49907e61454e9f3b5aa15c7d