Changed view to improve performance