Drain redux (48/48)

Drain redux