Sync edit

rework + collection ...