modified views, need to make some additional changes