Intermediate encoding improvements