New Decoder + grammar changes