improve warehouse + improve delivery method