Reorganized the draft