Performance improvement: improved view