Drain redux (2/48)

Drain redux