Moved tracking of sinks into function, not called by default.
	modified:   sim.py