Added changes from todays class