Stage changes
New data structure
fix
Save
Save
New structure done