Updated view functions