changed usage of normalization factors in simulator