more changes basic structure