[UPDATES] AI and clean up