Lot of AI fix