Trying to move all computations in the simulator