merge new functions (shipment and book view)