Modifies delivery logic for #67

Closes #67