Drain redux (47/48)

Drain redux