Decoder works - polishing needed