Drain redux (5/48)

Drain redux