Substitution mechanism improved.