Added stuff from class