Using new data
Fixed conflict