Small changes to Integrator (and possibly System)