added more things from class