Drain redux (36/48)

Drain redux