Drain redux (19/48)

Drain redux