Start fixing AI-3