Updated to use a variant of Dave Wards waterfallsink.py