first draft
fixes
fixes