Made scopes more efficient