Chapter rework