New code for trailers (again)