Added changes from our first meeting