Drain redux (43/48)

Drain redux