Upgrade to ensure 'water-a-plenty'