Drain redux (23/48)

Drain redux