added stuff from other computer