Final commit for 10/24/14