added stuff here and there