updated to reflect AI merge