fixed decoding
started with consolidation
merge