some update of structure