added stuff from friends