User-trip association stuff added