Further improvements to drop off code