added timestep check to avoid conflict