Less simplified files. Too many gaps in earlier version.