Drain redux (35/48)

Drain redux