Updated to take an argument indicating the simulator