Refactor with CS nodes
Refactor