CSR > Improve SOE performance

Improve SOE performance

I