FInal changes from meeting 10/20