tiny fix
change data structure.
core date structure.