Last changes from class