It wasn't easy, but the deal is done.

Criminal Minds star Thomas Gibson will return to the CBS drama, which is scheduled to begin production on its seventh season in just two weeks' time.

Gibson has signed on for two years in a deal worth "mid-to-high seven figures," according to Deadline. That and a signing bonus assures him a huge raise.

It wasn't known until the last minute if he would return, with the future of Gibson's character, Supervisory Agent Aaron Hotchner, left open-ended on May's season finale.

Nevertheless, Gibson had been fulfilling all of his Criminal Minds obligations despite not being signed, indicating optimism that a deal would be struck.

With Gibson and Shemar Moore re-signing, Joe Mantegna, Matthew Gray Gubler and Kristen Vangsness still under contract and Paget Brewster and A.J. Cook returning as regulars after dubious firings last season, the Criminal Minds cast is fully intact.

Season seven should be a good one!

Steve Marsi is the Managing Editor of TV Fanatic. Follow him on Google+ or email him here.