updated agd stuff. added ca template stuff