some changes for clean collaborative development