Work on draining ...