Rewrite draw to immediate call support