passing: major views refactoring