Drain redux (20/48)

Drain redux