made some changes
data merge