commit 10/23/2014 part 2
commit 10/24/2014
commit 10/24/2014 part 2