change shippingDepot to single row with 2 tables