Updated AIDT throughout