Added FillThenDrain capability.