updated with new stuff

Change-Id: I2e15c65818a8cfce68190c4366694dd42a6747d8