[UPDATE] structural modifications