Drain redux (17/48)

Drain redux