Updated agg directory to agg2

Here are the changes for agg2 we discussed, please let me know if there are any issues.

-K