merged and added collab functions