More changes from class