commit 12/14/2014 part 4
commit 12/14/2014 part 5