Civil_structure_6oct branch