McCain Re-shuffles Race Cards