Some more AI changes
merged