Improved trailers handling Pt II.