PRE Chris's changes

Currents, speed, parameters all match