After over a year out of the cage and a highly publicized quarrel with the UFC, Nick Diaz has signed a new three-fight extension with the UFC, and plans on returning in 2015. Diaz had been previously inconsistent as it pertained to his fighting future, saying that he'd only return for a title shot, or for a much larger contract. Earlier this year Diaz was seen taunting eventual UFC welterweight champion Johny Hendricks as he attempted to make weight. "I've been doing a whole lot of not getting punched around-type stuff," Diaz told UFC.com Thursday. "I've been staying in shape pretty good, doing a lot of running. It's been a good experience having this much time off." Diaz says he plans on returning to the cage in 2015, and wants a fight that will get him into title contention. Former Middleweight champion Anderson Silva has been tossed around as a potential opponent as well. "Next year I guess, whatever though. I can fight tomorrow; tonight," he said. "You have to do what you have to do. ... to sort things out with Dana White and Lorenzo . I'd like to fight for the title," Diaz said. "I think that would be a big deal and worth fighting for. I want fights that will lead to a title fight. Whoever is in line and whoever has the title, that's who I'm going to be fighting. I'd be interested in fighting and anything that's going to do well," he said. "As far as Anderson Silva, I think that would be a great fight for people to see because he has my type of style." Diaz last fought in 2013, coming up short against then-Welterweight champion Georges St-Pierre.