Tom's d'Etat will have old friend Rosario back aboard for Whitney