Changes from discussion on August 8th