More agent aggressive changes.
Merged my changes and Maria's changes