CSF performance upgrade