Improved copy
Fixed conflict