Added changes discussed in class