Add changes from meeting the 12th, sep