view update
refactoring