restructure the data and data function
Merge branch 'dev'