Improving. Istream initial draft OK.