Added substitution/normal_form