Improvements

- data restructure part 2