Fix CS
Index the remaining components