Finish fixing AI-3, 2nd commit