Added ability to vary timesteps as well