Preliminary timestep fixing [#15]