with new view
funtional changes