made changes from class