More AI changes - works pretty good!