Refactor to have mesures