more adds

Change-Id: Id6cf6a31e272c1cf38c3244b6dc8a6ea6d0e9cd8