Added changes made by Jacob