added collaboration stuff