structure adjusted
Merge branch