change data input
change structure