Go back to the old calculated methods for the simulation to work