Drain redux (30/48)

Drain redux