Final commit for jul 18 2014