Drain redux (15/48)

Drain redux