Updated view and index