Drain redux (10/48)

Drain redux