Drain redux (45/48)

Drain redux