added CBI relevant parts