Drain redux (26/48)

Drain redux