added agd context
merged