Thanks for the imput guys.
I will talk to the dealer again with regard to the remap for the TORs and let you know the outcome.

May you be in heaven half an hour before the devil knows your dead