added stuff from previous classes