structure changes

---