smoothed out the delivery address code, where the calculation now works well.