Added changes we talked about in meeting today