I'm just so relieved to hear it. I went over the scene of him at NCIS over and over again - it's substantially different to how it was in the beginning. He was a hard character to write.