C17 rework