Drain redux (24/48)

Drain redux