Updated to not fail until end of trips load