Newest Trips fix
includes instead of joins