modify structure
marge ours