CAG: adding my changes