updated substitute subdefinitions