some changes in subst list
jihih