structure changes
Fixes, changes...