Yes, and Aragorn & Arwen's story is what I am going through now, but I think it should be as the book has it. Not having Arwen follow the company unawares through Moria (somehow avoid Gollum & the Balrog) to join them later to help win Helm's Deep.--Mbo