Update the decoding to not be so brutal