Now with draw checking.