New flags just experimenting v1

Change-Id: I5135472801c2cbb4448f528af9c9213922f476da
v2 testing

Change-Id: Ibfc7862fa5be5df16c24c94f04fc9b6db3ecf1a5