made some updates from class