Udpate the simulator part ( not finish yet! )