Changed to only return needed info on main page and full info after