Drain redux (37/48)

Drain redux