Animated currents
Fixed bugs from prev version
Merged Momo's changes with mine