further streamlining...