yw,11-24-2014

Change-Id: I2a1b8d078812980bb7daef975a70f0c60de8d67b
11-24-2014, modified for suggestion from boss

Change-Id: Ie60c89375ad30f4807291e1c0a44932c75665d39