modify: more corrections about the structure.