final changes from class