commit 10/17/2014 part 6