Added --nowater option that may work for something