Further streamlining.