rework Changes structure