Changes from 8/26 email from Omer, added Kristell