more decoding changes