improve the data collect section
improve the data collect section