CSHEdit rework