Make calcul works after reorganisation