Modified race and class outlines, updated search