Structure changed
Merging conflict fixed