commit 11/4/2014 part 2
commit 12/14/2014