Adding ability to select timestep