changed order in methods and change in label names for delivery strings