first draft fix