Final changes from class