Fixed draft with jh's feedback