Final changes impl in AI, ID upl in progress