Fix CS, expand options