commit 12/14/2014 part 2