making draft more robust