more changes according to new effect analysis