major revision of structure