Please fix the drafting logic