Updated view solution