Added changes from meeting