Drain redux (38/48)

Drain redux