reworking draft model