Code re-format and added Animated Currents and Velocities