Drain redux (12/48)

Drain redux