Cups are beyond awful

Leak like crazy. Please fix.