Location no longer nested in trip