Changed some of the simulation and added some actions