added stuff from class 6