views and other changes