Drain redux (8/48)

Drain redux