Merged in Paddy's routing changes