two pages are working
upgrate models