refactor CSE
Merge origin/master