commit 10/10/2014 part 2