The next night on Raw, he stated that his match with the Undertaker had made a shoulder injury worse. When sidelined, he appeared on RAW and stated that he could not get drafted due to injury. He was informed by Vince McMahon that he was indeed eligible for the draft. He returned to Smackdown!. He started his feud with the Undertaker again defeating him at Summerslam in a Casket Match. The following 2 months, he was in the Elimination match at Survivor Series, getting the victory for Team Smackdown. At the event The Undertaker appeared from a flaming casket after Randy Orton "killed" him on an episode of Smackdown. The feud was finally finished in a Hell In A Cell match at Armageddon, where the Undertaker won.