Drain redux (40/48)

Drain redux