New structure.
Fixed merge.
Fixed merge