adding some stuff from previous classes