Change the strucutre