Changes from class