se[civ] tests and implementation done
cl[civ] tests and implementation done