Fix popin
Add composition to trips