Better AI logic
Merge