Changed timestep and added time measurement