Changes to DTN logic