Updated with more informations