added stuff from video 16