Non-destructive editing