commit 10/31/2014 part 2
commit 10/31/2014 part 3