major update
structure