commit 10/17/2014 part 30
commit 10/17/2014 part 31