lot of views refactored. sort of