nightmare and smartass 2

Change-Id: I2692589bd483f0c1bda7c321c2fc0536da72f984