modifications from class