Added changes discussed during meeting