more work on drain