first step towards eliminate orientSubstitution