Incorporating feedback from scott and others in order to get this branch approved.