commit 12/18/2014