change data style, rewrite
fix