works but need some changes in the page view