fix lazy evaluation problem
change simulation files