added a bunch of delivery changes