first draft
re-structure