Drain redux (16/48)

Drain redux