Added logistics, tested