new views refactor