local delivery option, more testing and debugging