Added changes for final project