updated to get more infos