first draft
more changes