Some reworking on draft recognition and start of draw recognition