Updated several things for AI