Added changes from class