some adjust on the structure