Drain redux (28/48)

Drain redux