change of all structure
modifications bigs
merge solution