rev-pr-02

Redesign of intermediate language.