DZAI update

"final" version