BaseAI updates on this branch too.