further revisions, streamlining