Drain redux (39/48)

Drain redux