Updated to incorporate availability checking for delivery