more decoding logic
Merge