Drain redux (33/48)

Drain redux