Finished the new draft (for now)