Updated view
Refactoring