Raising the bar

Change-Id: Ic16d2d2aadcd019d8e43233cc05cc25957579972