added AD12
Merged to AD12