Edw file2

Laurence please merge this branch for imminent release.   A bug fix to posting, plus a performance improvement.  Thanks!   Kate