Attempt at fixing streamlining