work on data restructure