Drain redux (46/48)

Drain redux