Addition of Draft Mode