Drain redux (25/48)

Drain redux