Changing to use decode as final step.