various updates necessary for AD