Changes made after 10/30 meeting