more changes for ecoop submission