structure fixes
structure fixes