re-do of structure