dded some stuff from class 3