changed train so it uses our data
merged?