Updated for performance

- Inview isn’t added when it’s not needed