[Minor changes from todays meeting]